make kml skip and ignore list constexpr. (#846)

diff --git a/kml.cc b/kml.cc
index 695b30d65a802001110d3d3a641d2fa5108a9803..4af7378e03b347229aa3bbe7a0346534933a3292 100644 (file)
--- a/kml.cc
+++ b/kml.cc
@@ -110,21 +110,6 @@ void KmlFormat::kml_step_color()
   kml_color_sequencer.seq = kml_color_sequencer.seq + kml_color_sequencer.step;
 }
 
-const char* KmlFormat::kml_tags_to_ignore[] = {
-  "kml",
-  "Document",
-  "Folder",
-  nullptr
-};
-
-const char* KmlFormat::kml_tags_to_skip[] = {
-  "Camera",
-  "LookAt",
-  "styleUrl",
-  "snippet",
-  nullptr
-};
-
 void KmlFormat::wpt_s(xg_string /*args*/, const QXmlStreamAttributes* /*attrs*/)
 {
   if (wpt_tmp) {

diff --git a/kml.h b/kml.h
index d324b167f116ed9c1d5a15fb95ddba8122f6ca93..59f57dab98e23f50e7640f5f6f51a3d00a4dad79 100644 (file)
--- a/kml.h
+++ b/kml.h
@@ -101,6 +101,21 @@ private:
   static constexpr const char* default_precision = "6";
   static constexpr int kml_color_limit = 204;  /* allowed range [0,255] */
 
+  static constexpr const char* kml_tags_to_ignore[] = {
+    "kml",
+    "Document",
+    "Folder",
+    nullptr
+  };
+  
+  static constexpr const char* kml_tags_to_skip[] = {
+    "Camera",
+    "LookAt",
+    "styleUrl",
+    "snippet",
+    nullptr
+  };
+
   // Multitrack ids to correlate Schema to SchemaData
   static constexpr const char* kmt_heartrate = "heartrate";
   static constexpr const char* kmt_cadence = "cadence";
@@ -330,9 +345,6 @@ private:
     {&KmlFormat::gx_trk_coord, cb_cdata, "/Placemark/MultiTrack/Track/coord"} // KML 2.3
   };
 
-  static const char* kml_tags_to_ignore[];
-  static const char* kml_tags_to_skip[];
-
   // The TimeSpan/begin and TimeSpan/end DateTimes:
   gpsbabel::DateTime wpt_timespan_begin, wpt_timespan_end;